From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 7 Jan 2011 20:47:05 +0000 (-0800)
Subject: Merge branches 'amba' and 'dma40' into dmaengine
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~15391^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=bc0fa81473c077bf4403e3b7b3397326204b65cd;p=linux-4.9.git

Merge branches 'amba' and 'dma40' into dmaengine
---

bc0fa81473c077bf4403e3b7b3397326204b65cd